src: update for mutter include reorganization

https://bugzilla.gnome.org/show_bug.cgi?id=641724

diff --git a/src/gnome-shell-plugin.c b/src/gnome-shell-plugin.c
index d634391cb0f98fd351b4077737418e21234513c1..8bf7441be95c420a5b0ddb0747d6b3bc899401d7 100644 (file)
--- a/src/gnome-shell-plugin.c
+++ b/src/gnome-shell-plugin.c
@@ -25,18 +25,16 @@
 
 #include "config.h"
 
-#include <meta-plugin.h>
-
-#include <clutter/clutter.h>
-#include <clutter/x11/clutter-x11.h>
-#include <gjs/gjs.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include <clutter/clutter.h>
+#include <clutter/x11/clutter-x11.h>
 #include <GL/glx.h>
 #include <GL/glxext.h>
-
-#include "display.h"
+#include <gjs/gjs.h>
+#include <meta/display.h>
+#include <meta/meta-plugin.h>
 
 #include "shell-global-private.h"
 #include "shell-perf-log.h"

diff --git a/src/main.c b/src/main.c
index 91cd96864f4f2865fe531129703517a57346a369..ba53a73aca1f560e0a090097434a54025bb3e374 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -16,9 +16,9 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 #include <girepository.h>
-#include <main.h>
-#include <meta-plugin.h>
-#include <prefs.h>
+#include <meta/main.h>
+#include <meta/meta-plugin.h>
+#include <meta/prefs.h>
 
 #include "shell-a11y.h"
 #include "shell-global.h"

diff --git a/src/shell-app-system.c b/src/shell-app-system.c
index 301fc3f5d7891e59aaf418fa88731f99824c2bbf..519a83010e5878859e7dba88f36fa9eb7aeba3b0 100644 (file)
--- a/src/shell-app-system.c
+++ b/src/shell-app-system.c
@@ -10,11 +10,11 @@
 #include <gtk/gtk.h>
 #include <clutter/clutter.h>
 #include <glib/gi18n.h>
+#include <meta/display.h>
 
 #include "shell-app-private.h"
 #include "shell-window-tracker-private.h"
 #include "shell-global.h"
-#include "display.h"
 #include "st.h"
 
 #define GMENU_I_KNOW_THIS_IS_UNSTABLE

diff --git a/src/shell-app-system.h b/src/shell-app-system.h
index 07684b791d7f055939d2be69f8c186f9da39deb0..3b615cecb3cfde4a3c82dc13e25ca5a9bed33998 100644 (file)
--- a/src/shell-app-system.h
+++ b/src/shell-app-system.h
@@ -4,9 +4,9 @@
 
 #include <gio/gio.h>
 #include <clutter/clutter.h>
+#include <meta/window.h>
 
 #include "shell-app.h"
-#include "window.h"
 
 #define SHELL_TYPE_APP_SYSTEM                 (shell_app_system_get_type ())
 #define SHELL_APP_SYSTEM(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), SHELL_TYPE_APP_SYSTEM, ShellAppSystem))

diff --git a/src/shell-app-usage.c b/src/shell-app-usage.c
index e8fe3ae8ac15e82114696bd83eb5d015ac041360..7b70a138ac0521378b38060947e12e3481c3382d 100644 (file)
--- a/src/shell-app-usage.c
+++ b/src/shell-app-usage.c
@@ -12,16 +12,15 @@
 #include <glib.h>
 #include <gio/gio.h>
 #include <dbus/dbus-glib.h>
+#include <meta/display.h>
+#include <meta/group.h>
+#include <meta/window.h>
 
 #include "shell-app-usage.h"
 #include "shell-window-tracker.h"
 #include "shell-global.h"
 #include "shell-marshal.h"
 
-#include "display.h"
-#include "window.h"
-#include "group.h"
-
 /* This file includes modified code from
  * desktop-data-engine/engine-dbus/hippo-application-monitor.c
  * in the functions collecting application usage data.

diff --git a/src/shell-app.c b/src/shell-app.c
index 74b72fb33c9589b32e8ed637364c99ec805770ad..9ffe856540aac9b7175d64ac6e42e13499e79fe8 100644 (file)
--- a/src/shell-app.c
+++ b/src/shell-app.c
@@ -2,15 +2,15 @@
 
 #include "config.h"
 
-#include "st.h"
+#include <string.h>
+
+#include <meta/display.h>
+
 #include "shell-app-private.h"
-#include "shell-global.h"
 #include "shell-enum-types.h"
-#include "display.h"
-#include "st.h"
+#include "shell-global.h"
 #include "shell-window-tracker-private.h"
-
-#include <string.h>
+#include "st.h"
 
 /* This is mainly a memory usage optimization - the user is going to
  * be running far fewer of the applications at one time than they have

diff --git a/src/shell-app.h b/src/shell-app.h
index 78b61f5ad48ea641e2d69785b29c05d89cb97002..729cfecc8e7b747d8ede8daccce06570cd399ccd 100644 (file)
--- a/src/shell-app.h
+++ b/src/shell-app.h
@@ -4,8 +4,7 @@
 
 #include <clutter/clutter.h>
 #include <gio/gio.h>
-
-#include "window.h"
+#include <meta/window.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/shell-global.c b/src/shell-global.c
index 5a2f2e668fec2d410add646ef1ecfc662fb565b0..b16758ff51c50c86010a09cafddbb87eba585181 100644 (file)
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -2,38 +2,39 @@
 
 #include "config.h"
 
-#include "shell-global-private.h"
-#include "shell-enum-types.h"
-#include "shell-perf-log.h"
-#include "shell-window-tracker.h"
-#include "shell-marshal.h"
-#include "shell-wm.h"
-#include "st.h"
-
-#include "display.h"
-#include "util.h"
-#include <clutter/glx/clutter-glx.h>
-#include <clutter/x11/clutter-x11.h>
-#include <gdk/gdkx.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <math.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
+
+#include <X11/extensions/Xfixes.h>
+#include <canberra.h>
+#include <clutter/glx/clutter-glx.h>
+#include <clutter/x11/clutter-x11.h>
 #include <dbus/dbus-glib.h>
+#include <gdk/gdkx.h>
 #include <gio/gio.h>
-#include <math.h>
-#include <X11/extensions/Xfixes.h>
 #include <gjs/gjs-module.h>
-#include <canberra.h>
-#include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
+#include <libxml/xmlmemory.h>
+#include <meta/display.h>
+#include <meta/util.h>
+
+#include "shell-enum-types.h"
+#include "shell-global-private.h"
 #include "shell-jsapi-compat-private.h"
+#include "shell-marshal.h"
+#include "shell-perf-log.h"
+#include "shell-window-tracker.h"
+#include "shell-wm.h"
+#include "st.h"
 
 static void grab_notify (GtkWidget *widget, gboolean is_grab, gpointer user_data);
 

diff --git a/src/shell-global.h b/src/shell-global.h
index 66b9127355bd061c1b13bd6ecbad7de0403e2419..42909801c02f137f3ba2fd1340f0327f6034193c 100644 (file)
--- a/src/shell-global.h
+++ b/src/shell-global.h
@@ -2,12 +2,11 @@
 #ifndef __SHELL_GLOBAL_H__
 #define __SHELL_GLOBAL_H__
 
-#include "meta-plugin.h"
 #include <clutter/clutter.h>
 #include <glib-object.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
-
+#include <meta/meta-plugin.h>
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS

diff --git a/src/shell-tray-manager.c b/src/shell-tray-manager.c
index 0d126e9205ae5368fa3168d7f93938dc73a4b275..2efbc4fe7c53c8f56a75104da4107dea7b0c464e 100644 (file)
--- a/src/shell-tray-manager.c
+++ b/src/shell-tray-manager.c
@@ -4,11 +4,9 @@
 
 #include <clutter/clutter.h>
 #include <clutter/x11/clutter-x11.h>
-#include <gtk/gtk.h>
-
-#include <display.h>
-
 #include <girepository.h>
+#include <gtk/gtk.h>
+#include <meta/display.h>
 
 #include "shell-tray-manager.h"
 #include "na-tray-manager.h"

diff --git a/src/shell-window-tracker.c b/src/shell-window-tracker.c
index 25ee54437b4e1b09c0450bba024199a4a5790109..d2889236f6f312b1d1d29be3144d77fe20028e88 100644 (file)
--- a/src/shell-window-tracker.c
+++ b/src/shell-window-tracker.c
@@ -9,6 +9,10 @@
 #include <X11/Xatom.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
+#include <meta/display.h>
+#include <meta/group.h>
+#include <meta/util.h>
+#include <meta/window.h>
 
 #define SN_API_NOT_YET_FROZEN 1
 #include <libsn/sn.h>
@@ -20,11 +24,6 @@
 #include "shell-marshal.h"
 #include "st.h"
 
-#include "display.h"
-#include "window.h"
-#include "group.h"
-#include "util.h"
-
 /* This file includes modified code from
  * desktop-data-engine/engine-dbus/hippo-application-monitor.c
  * in the functions collecting application usage data.

diff --git a/src/shell-window-tracker.h b/src/shell-window-tracker.h
index bb2014dbedb71db0d845628adb36d28b062ef363..9e16f47446b2753ed14c7f6943839c51e6fc381a 100644 (file)
--- a/src/shell-window-tracker.h
+++ b/src/shell-window-tracker.h
@@ -4,8 +4,8 @@
 
 #include <glib-object.h>
 #include <glib.h>
+#include <meta/window.h>
 
-#include "window.h"
 #include "shell-app.h"
 #include "shell-app-system.h"
 

diff --git a/src/shell-wm.c b/src/shell-wm.c
index 669ef4afb6e73af2947a10d05560798d2e149abe..a47376355ecd157a7a374ffb003fc95d400593a4 100644 (file)
--- a/src/shell-wm.c
+++ b/src/shell-wm.c
@@ -4,12 +4,12 @@
 
 #include <string.h>
 
+#include <meta/keybindings.h>
+
 #include "shell-wm-private.h"
 #include "shell-global.h"
 #include "shell-marshal.h"
 
-#include <keybindings.h>
-
 struct _ShellWM {
   GObject parent;
 

diff --git a/src/shell-wm.h b/src/shell-wm.h
index 477ac1e7081ca386718be12ad2f9e3376985693e..81fe83f13425ab96c4bc4ea7ab1cd42b429c7bbe 100644 (file)
--- a/src/shell-wm.h
+++ b/src/shell-wm.h
@@ -3,7 +3,7 @@
 #define __SHELL_WM_H__
 
 #include <glib-object.h>
-#include <meta-plugin.h>
+#include <meta/meta-plugin.h>
 
 G_BEGIN_DECLS